[myproxy/el5: 3/3] Merge branch 'master' into el5
stevetraylen
stevetraylen at fedoraproject.org
Sat Oct 1 19:20:31 UTC 2011
commit dba4c91055dfd4b456979d8900a1ea26b41612d6
Merge: 9ed69c0 f65c943
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Sat Oct 1 21:20:17 2011 +0200
Merge branch 'master' into el5
.gitignore | 1 +
myproxy-globus-7129-ptII.patch | 30 -----------
myproxy-globus-7129-ptIII.patch | 57 --------------------
myproxy-globus-7129.patch | 110 ---------------------------------------
myproxy.init | 2 +-
myproxy.spec | 17 +++----
myproxy.sysconfig | 2 +-
sources | 2 +-
8 files changed, 11 insertions(+), 210 deletions(-)
---
diff --cc .gitignore
index a6f74ec,50b5f6f..1875dc9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
-myproxy-5.2.tar.gz
/myproxy-5.3.tar.gz
/myproxy-5.4.tar.gz
+ /myproxy-5.5.tar.gz
More information about the scm-commits
mailing list