Merge pull request #125 from morpheyesh/0.6

byoc aws s3 fix
megamsys · Feb 24, 2015 · 8f661eb · 8f661eb
2 parents 06fad25 + da9b5fc
commit 8f661eb
Show file tree

Hide file tree

Showing 2 changed files with 394 additions and 1 deletion.
diff --git a/app/models/MarketPlaces.scala b/app/models/MarketPlaces.scala
@@ -182,7 +182,7 @@ object MarketPlaceInput {
 "3-Megam-StarterPack-Play" -> MarketPlaceInput("3-Megam-StarterPack-Play", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/play.png", "1-Starter packs", "RESTful API Server"), MarketPlacePlans(List(new MarketPlacePlan("0", "Build robust RESTful API server using NoSQL(Riak).", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
 "4-Megam-StarterPack-Akka" -> MarketPlaceInput("4-Megam-StarterPack-Akka", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/akka.png", "1-Starter packs", "Clustered HA Daemon"), MarketPlacePlans(List(new MarketPlacePlan("0", "Build powerful concurrent & distributed applications more easily with messaging.", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
 "5-Megam-StarterPack-Nodejs" -> MarketPlaceInput("5-Megam-StarterPack-Nodejs", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/nodejs.png", "1-Starter packs", "Realtime App"), MarketPlacePlans(List(new MarketPlacePlan("0", "Build fast, scalable, and incredibly efficient blogging platform with light weight database.", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
-"6-Megam-StarterPack-Byoc" -> MarketPlaceInput("6-Megam-StarterPack-Byoc", new MarketPlaceAppDetails("", "1-Starter packs", "Bring your own code"), MarketPlacePlans(List(new MarketPlacePlan("0", "", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
+"6-Megam-StarterPack-Byoc" -> MarketPlaceInput("6-Megam-StarterPack-Byoc", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/byoc.png", "1-Starter packs", "Bring your own code"), MarketPlacePlans(List(new MarketPlacePlan("0", "", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
 "7-Megam-platform-Docker" -> MarketPlaceInput("7-Megam-platform-Docker", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/docker.png", "2-Platform", "Container"), MarketPlacePlans(List(new MarketPlacePlan("0", "Docker that automates the deployment of applications inside software containers.", "Free", "0.5", "", "Ubuntu 14.04 +"))), "false", "predefnode", "false"),
 "8-Megam-AppBoilers-PostgreSQL" -> MarketPlaceInput("8-Megam-AppBoilers-PostgreSQL", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/postgres.png", "4-App Boilers", "Object Relational DBMS"), MarketPlacePlans(List(new MarketPlacePlan("0", "PostgreSQL is a powerful, open source object-relational database system.", "Free", "9.3", "", "Ubuntu 14.04 +"))), "false", "predefnode", "true"),
 "9-Megam-AppBoilers-Riak" -> MarketPlaceInput("9-Megam-AppBoilers-Riak", new MarketPlaceAppDetails("https://s3-ap-southeast-1.amazonaws.com/megampub/images/market_place_images/riak.png", "4-App Boilers", "Scalable Distributed Database"),