Commit graph

6 commits

Author SHA1 Message Date
Tim Nagel
c4210a5c6d Fix previous merge 2014-09-04 09:37:27 +10:00
Tim Nagel
029ebb153a Merge remote-tracking branch 'upstream/pr/705' into 3.0.x
Conflicts:
	Index/AliasProcessor.php
2014-09-04 09:26:53 +10:00
Patrick McAndrew
76dcd2f62e fix warning if no aliases
PHP Warning:  array_keys() expects parameter 1 to be array, AliasProcessor.php on line 128
2014-08-29 15:52:46 +01:00
Patrick McAndrew
2958833012 Ability to delete an index if expecting an alias 2014-08-28 17:59:58 +01:00
Tim Nagel
ad37a28356 Fix populating command setting alias before population 2014-06-27 15:08:56 +10:00
Tim Nagel
4e990e0cee Fixed mapping issues 2014-06-19 00:14:41 +10:00