Merge branch 'master' into leap

There were merge conflicts with this merge, but I deliberately
merged with '-s recursive -X theirs' to take the shared modules
version of the changes.

We had some changes that we made, that I will incorporate as
separate commits on top of shared

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/init.pp b/tests/init.pp
new file mode 100644
index 0000000..d8d40ed
--- /dev/null
+++ b/tests/init.pp
@@ -0,0 +1,5 @@
+class { 'reprepro':
+  uploaders => ['DEADBEEF'],
+  handle_incoming_with_cron => true,
+  handle_incoming_with_inotify => true,
+}