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

Cleanup root directory #4850

Merged
merged 1 commit into from Oct 3, 2015
Merged

Cleanup root directory #4850

merged 1 commit into from Oct 3, 2015

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Sep 29, 2015

@smarterclayton @dgoodwin
Rebased #4655 and fixes rpm builds via tito

@dgoodwin
Copy link
Contributor

LGTM. Probably a good idea to separate the various non-tito things from rel-eng dir as well. 👍

@sdodson
Copy link
Member Author

sdodson commented Sep 29, 2015

@dgoodwin Ok, lemme review that directory structure.

@sdodson
Copy link
Member Author

sdodson commented Sep 29, 2015

Good to go, let me know if you'd like me to squash everything down to 1 or 2 commits. As it is now I think there's some intermediate commits that don't leave things in a good state.

@sdodson sdodson force-pushed the pr4655 branch 3 times, most recently from 5dc75a7 to 9430d82 Compare September 29, 2015 20:00
@sdodson
Copy link
Member Author

sdodson commented Sep 30, 2015

@smarterclayton PTAL the functional diff from your original PR is that we have a .tito directory and origin.spec in the root of the repo. That's the best we can do right now.

@smarterclayton
Copy link
Contributor

That's fine - go ahead and squash what you need to squash and I'll merge. Thanks!

Move non-core resources to contrib/
Bash completions now in contrib/completions/bash
Systemd services and environment files now contrib/systemd
Update Vagrantfile after contrib/ move
Update pod.json to be v1
Update scripts
@sdodson
Copy link
Member Author

sdodson commented Oct 3, 2015

Squashed everything down. Ready to merge.

@smarterclayton
Copy link
Contributor

LGTM [merge]

@smarterclayton
Copy link
Contributor

Thanks

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3479/) (Image: devenv-fedora_2451)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to ce9187e

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5378/)

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to ce9187e

openshift-bot pushed a commit that referenced this pull request Oct 3, 2015
Merged by openshift-bot
@openshift-bot openshift-bot merged commit 7a1c3ea into openshift:master Oct 3, 2015
@sdodson sdodson deleted the pr4655 branch May 11, 2018 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants