Merge remote branch 'origin/master'

diff --git a/Makefile b/Makefile
index 31506ce..fbd2a0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ wsdl-clean:
 
 # are the .java files used ?
 tags:  
-       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
@@ -69,7 +69,7 @@ SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
-RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES         := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 

diff --git a/sfa/methods/GetCredential.py b/sfa/methods/GetCredential.py
index df6e868..1f8c71a 100644 (file)
--- a/sfa/methods/GetCredential.py
+++ b/sfa/methods/GetCredential.py
@@ -13,7 +13,7 @@ from sfa.trust.credential import Credential
 class GetCredential(Method):
     """
     Retrive a credential for an object
-    If cred == Nonee then the behavior reverts to get_self_credential
+    If cred == None then the behavior reverts to get_self_credential
 
     @param hrn human readable name of object (hrn or urn)
     @param cred credential object specifying rights of the caller