{"shas":[["08f59be870ddf64105a1a4c9d67d80663f77d131","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'master' of https://github.com/firo222/fluent-nhibernate into firo222-master\n\nConflicts:\n\tsrc/FluentNHibernate/FluentNHibernate.csproj\n\tsrc/FluentNHibernate/Mapping/ToManyBase.cs\n\tsrc/FluentNHibernate/MappingModel/Collections/IndexMapping.cs\n\tsrc/FluentNHibernate/MappingModel/Output/XmlIndexWriter.cs","James Gregory"],["3bf3266543463da55d1c96b32d8f787dcdadf7f0","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'fix216' of https://github.com/icambron/fluent-nhibernate into icambron-fix216\n\nConflicts:\n\tsrc/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj","James Gregory"],["ea41a9e9cdf51b8e7913000244e82bb1a38948b0","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge pull request #29 from icambron/automapped_filters\n\nadded convenience for adding filters to automaps","James Gregory"],["9375fefec078744833be79961ea93cc463ff6053","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'master' of https://github.com/tangbiao/fluent-nhibernate into tangbiao-master\n\nConflicts:\n\tsrc/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj\n\tsrc/FluentNHibernate/FluentNHibernate.csproj","James Gregory"],["0c76901ee02203d84db92cf3cfa328ac74bc41e2","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'expose_entity_type' of https://github.com/icambron/fluent-nhibernate into icambron-expose_entity_type\n\nConflicts:\n\tsrc/FluentNHibernate/Mapping/ManyToManyPart.cs\n\tsrc/FluentNHibernate/Mapping/ToManyBase.cs","James Gregory"],["37156dcbc6fc20a82597600741a73076e3d11439","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'fkcascade' of https://github.com/sonix1977nl/fluent-nhibernate into sonix1977nl-fkcascade","James Gregory"],["65f16d0b3d2414987c3a1a93bc9dd6e7216abbaa","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge commit 'bebb9da'\n\nConflicts:\n\tsrc/FluentNHibernate/FluentNHibernate.csproj\n\tsrc/FluentNHibernate/Mapping/Builders/MapBuilder.cs","James Gregory"],["8e7d91b1939fdb1fb24081c7d51ba1451a4198ad","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Well that was silly. Fixed unresolved conflict","James Gregory"],["c81830bebff0291887b34c7fd63b38eb096c070a","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'master' of https://github.com/benfulton/fluent-nhibernate into benfulton-master","James Gregory"],["90c5d47246238fad38e6f46e89f8cd05eadcd9a8","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Added warning disable for ProxyFactoryFactory test","James Gregory"],["ffc08e2c33367c7959821885fa21b3e35e4863d9","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Removed broken xml doc comment","James Gregory"],["ff750122cc3cbed8236221aedb281fc8599b722d","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Updated NHibernate 3.x assemblies to 3.2","James Gregory"],["6a73a7b42748d0bd257b8b2343fc7f43a03e410c","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Upgraded SQLite to fix some breaking change introduced by NH3.2","James Gregory"],["7334656b1cc97b3759a2a5c6abe497fc20683875","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Removed references to the Castle proxy factory","James Gregory"],["de40e896bbe346a4812e2496ddfd96ce6a8385aa","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Removed configuration methods which were obsoleted in the previous\nrelease.","James Gregory"],["f22a011aaba0d68a0fd901afa397511547ce8858","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge branch 'cleaner_override' of https://github.com/icambron/fluent-nhibernate into icambron-cleaner_override\n\nConflicts:\n\tsrc/FluentNHibernate/Automapping/Alterations/AutoMappingOverrideAlteration.cs","James Gregory"],["654e03fb89cef2ca0504f99e4a2b4c0a44756486","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge pull request #22 from jochenjonc/master\n\nPersistenceSpecification in a TransactionScope","James Gregory"],["20d6f03f7a7970388242a1bbcfede18ddbc75993","c2ce71428bff89556458a3d5dd1fafb8d5b66101@gmail.com","Added missed reference to System.Transactions","Alexander Zaytsev"],["5386c2d94c47060269ff9c3c4344069552b14bd2","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Merge pull request #81 from hazzik/patch-1\n\nAdded missed reference to System.Transactions","James Gregory"],["1a83268fec0584141efc815f8282ec05e381292f","474ba67bdb289c6263b36dfd8a7bed6c85b04943@jagregory.com","Updated nuget dependency to point to NH 3.2","James Gregory"]],"ref":"refs/heads/v1.x","size":24,"head":"c24de5a65874a5c9e812395cd491eab0fd79d2e9","push_id":39396819}