[openshift-origin-cartridge-abstract/f17: 2/2] Merge branch 'master' into f17

[tdawson]

commit c99188ef6839cb40e24cc2f4c625081d9d1ab5ba
Merge: f23cbbc 84e91e4
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 11:00:54 2012 -0600

    Merge branch 'master' into f17

 .gitignore                               |    1 +
 openshift-origin-cartridge-abstract.spec |   60 +++++++++++++++++++++++++++---
 sources                                  |    2 +-
 3 files changed, 56 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 59c3379,3b27dda..0014541
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -/openshift-origin-cartridge-abstract-0.14.4.tar.gz
  /openshift-origin-cartridge-abstract-1.0.4.tar.gz
  /openshift-origin-cartridge-abstract-1.1.7.tar.gz
+ /openshift-origin-cartridge-abstract-1.2.8.tar.gz