Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build break around dynamic links - pulls in some of rob's import changes and Andi's nagios changes. [5/6] #154

Merged
merged 54 commits into from Mar 2, 2012
Merged

Fix build break around dynamic links - pulls in some of rob's import changes and Andi's nagios changes. [5/6] #154

merged 54 commits into from Mar 2, 2012

Conversation

galthaus
Copy link
Contributor

@galthaus galthaus commented Mar 2, 2012

barclamps/crowbar | 2 +-
barclamps/ganglia | 2 +-
barclamps/nagios | 2 +-
barclamps/provisioner | 2 +-
extra/barclamp_mgmt_lib.rb | 3 +++
5 files changed, 7 insertions(+), 4 deletions(-)

Victor Lowther and others added 30 commits February 16, 2012 15:52
But only if the build cache is a git repository, of course.
Instead of just using the initial upstream submodule URL when performing an
initial git submodule update, rewrite the URL to match what is in
DEV_REMOTE_SOURCES for the upstream remote for the branch the submodule was
imported from.
We always want to make sure we are cloning from the "proper"
upstream, regardless of what is in .gitmodules.
…f1f687cc5

Update the network ref and the json file for bonding on router_prefs [1/2]
…161973

Backport router filtering by router_pref [2/3]
galthaus and others added 24 commits February 24, 2012 12:45
…814bdc478

Pull in DE626 for fledermaus [1/2]
…065843e87

Fix ubuntu path of xml file for solr fix [1/2]
…hef/master

Add groudwork for making install-chef more paranoid [2/4]
@zehicle
Copy link
Member

zehicle commented Mar 2, 2012

mainly bringing in latest barclamps

@zehicle zehicle closed this Mar 2, 2012
zehicle pushed a commit that referenced this pull request Mar 2, 2012
…1df21fd02

Fix build break around dynamic links - pulls in some of rob's import changes and Andi's nagios changes. [5/6]
@zehicle zehicle merged commit ebf11ec into crowbar:openstack-os-build Mar 2, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants