diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-02 15:39:56 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-02 15:39:56 -0400 |
| commit | cc65f03c894af8c40cf9c25128c9834f6cbdd02b (patch) | |
| tree | cb7d113579bb1db1f685408b198397a89052b892 /.tito | |
| parent | ef6b36d14a00757754aaf001a8acad8354cf62ff (diff) | |
| parent | a4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff) | |
| download | openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.gz openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.bz2 openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.xz openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to '.tito')
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | .tito/packages/openshift-ansible-bin | 1 | ||||
| -rw-r--r-- | .tito/packages/openshift-ansible-inventory | 1 | ||||
| -rw-r--r-- | .tito/releasers.conf | 13 |
4 files changed, 16 insertions, 1 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index adbed6b1d..92f545b25 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.2-1 ./ +3.0.6-1 ./ diff --git a/.tito/packages/openshift-ansible-bin b/.tito/packages/openshift-ansible-bin new file mode 100644 index 000000000..5275dfcf9 --- /dev/null +++ b/.tito/packages/openshift-ansible-bin @@ -0,0 +1 @@ +0.0.21-1 bin/ diff --git a/.tito/packages/openshift-ansible-inventory b/.tito/packages/openshift-ansible-inventory new file mode 100644 index 000000000..85502438a --- /dev/null +++ b/.tito/packages/openshift-ansible-inventory @@ -0,0 +1 @@ +0.0.11-1 inventory/ diff --git a/.tito/releasers.conf b/.tito/releasers.conf new file mode 100644 index 000000000..f863ce9b1 --- /dev/null +++ b/.tito/releasers.conf @@ -0,0 +1,13 @@ +[brew] +releaser = tito.release.DistGitReleaser +branches = libra-rhel-7 + +[ose-3.0] +releaser = tito.release.DistGitReleaser +branches = rhose-3.0-rhel-7 +srpm_disttag = .el7ose + +[aos-3.1] +releaser = tito.release.DistGitReleaser +branches = rhaos-3.1-rhel-7 +srpm_disttag = .el7aos |