diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 11:48:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-16 11:48:26 +0000 |
| commit | ed658e8d65942495398e1e2e2f74f8c0a0acf978 (patch) | |
| tree | 60eab04017e28d09665910d9a6993bec90d57627 | |
| parent | e18f9779ab00fee7f31dd1ad9002dd7b799657a8 (diff) | |
| parent | c145db905d82d95a2cc02b90511c79bcf23b8c34 (diff) | |
Merge "Colorado: Rebase git submodules on stable/mitaka."
| -rw-r--r-- | .gitmodules | 18 | ||||
| m--------- | upstream/fuel | 0 | ||||
| m--------- | upstream/fuel-agent | 0 | ||||
| m--------- | upstream/fuel-astute | 0 | ||||
| m--------- | upstream/fuel-library | 0 | ||||
| m--------- | upstream/fuel-main | 0 | ||||
| m--------- | upstream/fuel-mirror | 0 | ||||
| m--------- | upstream/fuel-nailgun-agent | 0 | ||||
| m--------- | upstream/fuel-plugin-opendaylight | 0 | ||||
| m--------- | upstream/fuel-web | 0 |
10 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 1d729b0c..0023639c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,36 +1,36 @@ [submodule "opnfv-fuel"] path = upstream/fuel url = https://gerrit.opnfv.org/gerrit/fuel - branch = stable/brahmaputra + branch = master [submodule "fuel-main"] path = upstream/fuel-main url = https://github.com/openstack/fuel-main.git - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-library"] path = upstream/fuel-library url = https://github.com/openstack/fuel-library.git - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-web"] path = upstream/fuel-web url = https://github.com/openstack/fuel-web.git - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-agent"] path = upstream/fuel-agent url = https://github.com/openstack/fuel-agent.git - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-mirror"] path = upstream/fuel-mirror url = https://github.com/openstack/fuel-mirror.git - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-plugin-opendaylight"] path = upstream/fuel-plugin-opendaylight url = https://github.com/openstack/fuel-plugin-opendaylight.git - branch = brahmaputra-release + branch = master [submodule "fuel-nailgun-agent"] path = upstream/fuel-nailgun-agent url = https://github.com/openstack/fuel-nailgun-agent - branch = stable/8.0 + branch = stable/mitaka [submodule "fuel-astute"] path = upstream/fuel-astute url = https://github.com/openstack/fuel-astute.git - branch = stable/8.0 + branch = stable/mitaka diff --git a/upstream/fuel b/upstream/fuel -Subproject 3e535448fe1bad43d810d9b2ccf66f13bb7c10e +Subproject 678d3fafb75bca688ca4749073090cf42d16ec1 diff --git a/upstream/fuel-agent b/upstream/fuel-agent -Subproject 658be72c4b42d3e1436b86ac4567ab914bfb451 +Subproject 134c946d3497eafbbc57f4858c8b652b5c90e90 diff --git a/upstream/fuel-astute b/upstream/fuel-astute -Subproject b81577a5b7857c4be8748492bae1dec2fa89b44 +Subproject 9c2439fc69aec50b156740a012e077f95263dcc diff --git a/upstream/fuel-library b/upstream/fuel-library -Subproject c2a335b5b725f1b994f78d4c78723d29fa44685 +Subproject 7ffecbfddc052533b0202b5977c714a28c7767b diff --git a/upstream/fuel-main b/upstream/fuel-main -Subproject 643a1ef27c7dccc1c2a2ad26b85c09226b35a67 +Subproject d66dab3291d492e90c2955575df6ba5f43075c5 diff --git a/upstream/fuel-mirror b/upstream/fuel-mirror -Subproject fb45b80d7bee5899d931f926e5c9512e2b44274 +Subproject b1b806070603f11e63979206d97d41d1496cbd9 diff --git a/upstream/fuel-nailgun-agent b/upstream/fuel-nailgun-agent -Subproject b2bb466fd5bd92da614cdbd819d6999c510ebfb +Subproject 8b0ef4e707e6afaae1863978d8b5dc94eb6315b diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight -Subproject 2a24fe8e5ead193dd5ad9f4bec5a2d23db89f68 +Subproject 420f56552147b709cab5215ac591afd3968f6e4 diff --git a/upstream/fuel-web b/upstream/fuel-web -Subproject feff938157ce26d09409219350f126214dfeae4 +Subproject bf361759a672fc83212af30354d1da91fa9aaf5 |