Define SALT_BUCKETS
Define SALT_BUCKETS
Merge branch 'master' of github.com:tonyhuang/phoenix