mateusz

{
  "RainpatternVersion": "0.1",
  "Name": "medium",
  "Defaults": {
    "profile": "default",
    "rds-multi-az": "...",
    "rds-instance-type": "...",
    "rds-allocated-storage": "...",
    "nfs-multi-az": "...",
    "min-size": "...",

mateusz

diff --cc model/DB.php
index 985a420,5f215a6..0000000
--- a/model/DB.php
+++ b/model/DB.php
@@@ -233,13 -171,9 +233,13 @@@ class DB 
                self::$connection_attempted = true;
  
                $dbClass = $databaseConfig['type'];
 -              $conn = Injector::inst()->create($dbClass, $databaseConfig);
  

mateusz

---DOWNSTREAM---
commit df6a8b6fb630a7065c0066a3dae288ff23ddddf4
Author: Senorgeno <genedower@gmail.com>
Date:   Thu Jul 17 13:27:28 2014 +1200

    BUG #3282: Added ability to subselect with in left or inner join

diff --git a/model/SQLQuery.php b/model/SQLQuery.php
index 79ddb57..c4a12ca 100644
--- a/model/SQLQuery.php

mateusz

diff --cc model/DB.php
index 985a420,5f215a6..0000000
--- a/model/DB.php
+++ b/model/DB.php
@@@ -233,13 -171,9 +233,19 @@@ class DB 
                self::$connection_attempted = true;
  
                $dbClass = $databaseConfig['type'];
++<<<<<<< HEAD
++||||||| merged common ancestors

mateusz

(function($) {
	$('.cms-container').entwine({
		Handler: null,
		onmatch: function() {
			var self = this;
			var handler = function(e) {
				var closure = self;
				alert($(closure).attr('id'));
			};
			$(window).bind('load', handler);

mateusz

HIT_HMD2043

                               __    __
                                ||  ||
                                ||==|| I T
                               _||  ||_

                    Harold Innovation Technologies
                "If it ain't a HIT, it's a piece of..."