Merge remote-tracking branch 'origin/unstable' into merge-to-testing

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
        path = sdk/argeo-build
-       url = http://git.argeo.org/cc0/argeo-build.git
-       branch = unstable
+       url = https://code.argeo.org/git/cc0/argeo-build.git
+       branch = merge-to-testing

diff --git a/branch.mk b/branch.mk
index afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 0499267b5f2b534d852cc8a2d5a7070b21730ed4..5bf388711048a659992c292c4b9bdcbc595e066b 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0499267b5f2b534d852cc8a2d5a7070b21730ed4
+Subproject commit 5bf388711048a659992c292c4b9bdcbc595e066b

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644 (file)
index 0000000..22ef9a8
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=25
+qualifier=.next
\ No newline at end of file