48654d7 Merge branch 'master' into f24

Merged and Committed by maxamillion 7 years ago
    Merge branch 'master' into f24
    
    * master:
      remove ppc64 for now, appears to be a bug in golang
      add notes about golang bz
      fix cni paths for non-x86_64 arches
      update to latest upstream - 1.4.0
    
    Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
    
        
file modified
+1 -0
origin-1.4.0-build-platform.patch origin-1.3.0-build-platform.patch
file renamed
+21 -6
file modified
+1259 -885
file modified
+1 -1