From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Mon, 15 May 2017 13:00:46 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~3000
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ca1410f144f2ccfeca0826b589c776f6d46d1105;p=pixelpark%2Fhiera.git

Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

Conflicts:
	common.yaml
---

ca1410f144f2ccfeca0826b589c776f6d46d1105
diff --cc common.yaml
index 04987418,761ba653..021f44b9
--- a/common.yaml
+++ b/common.yaml
@@@ -813,7 -813,22 +813,17 @@@ accounts::users
      ssh_type: "ssh-rsa"
      comment: "Tobias Rotter tobias.rotter@publicispixelpark.de"
  
 -# Factorial GmbH (mbvd)
++  # Factorial GmbH (mbvd)
+   stephan.huber:
+     uid: 60210
+     key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDI8OlCOzlTPiCSqhiWbWqJtPCb45jc7ocCE5XrMCRgzz5SEAeoUHcAgmhtCR22AGZ+0Tp4pus9HIDoEJYrjAaeFDCEOdzcq8fmX6TBcBYDF4DO1Zey27IcNtwZx1sTXGAoMG15m9pw65PRBMJq//XyCnS5EguqXe+bck3SEIw4LdKDIFUTWpE1tM9D22jj2IQoH7Z+HPKYNVNzOYIlvPrz4GfgWG8Uf+7o5nKVzEpX666uYnOfQR9qpQTr/3ptqHuZScdkzYDumUvvsfX2teqIUF5rMh1DhbhbSXndcEUpNtvfaePesiBT6JnGQNykRCoXpDkHfJZBNBgUR0MwxMQr"
+     comment: "Stephan Huber - Factorial GmbH"
+   volkan.floerchinger:
+     uid: 66854
+     key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDRElDGMoZBuKf7R7OMXHngdIEFfTCd2n/3OcQiCiPbQTx4GjVx2E9q3AqsuIWX4DVTbmbM3jNtMXHphb05ezZbaHHEClrSKw+ES+XNV24T5M3Ft9EtdP6mu1vatnNpHwP8wO7WILeIyVmSRVlDWSMKY1/wvJX9LpG+2Y8VIGEaPksrCL3IXNcBkHCA0lpmVrn6M3UtqMADewvxGPoRoArH/V8/aTvT9y7ekq5F7rt+prTa0HUscklZjaQbT1KZnGQo8Qy639yJfuAMi13bJTjYbc0o2Zqf86BiQz1QIXZHJhPtRVwK/8W363F1nWfOvdXNS9kyfr12Ctd2klJYJKovAAAAB3NzaC1yc2EAAAADAQABAAABAQDRElDGMoZBuKf7R7OMXHngdIEFfTCd2n/3OcQiCiPbQTx4GjVx2E9q3AqsuIWX4DVTbmbM3jNtMXHphb05ezZbaHHEClrSKw+ES+XNV24T5M3Ft9EtdP6mu1vatnNpHwP8wO7WILeIyVmSRVlDWSMKY1/wvJX9LpG+2Y8VIGEaPksrCL3IXNcBkHCA0lpmVrn6M3UtqMADewvxGPoRoArH/V8/aTvT9y7ekq5F7rt+prTa0HUscklZjaQbT1KZnGQo8Qy639yJfuAMi13bJTjYbc0o2Zqf86BiQz1QIXZHJhPtRVwK/8W363F1nWfOvdXNS9kyfr12Ctd2klJYJKov"
+     comment: "Volkan Floerchinger - Factorial GmbH"
+ 
 -# 60220   ries # j.ries@emperra.com
 -# 60221   bentrup # m.betrup@emperra.com
 -# 60222   pratsch
 -# 60223   bruestel
 -
 -# Sparkassen Entwickler (UIID von 60300 - 60350)
 +  # Sparkassen Entwickler (UIID von 60300 - 60350)
    christian.stoehr:
      uid: 60300
      key: "AAAAB3NzaC1yc2EAAAABJQAAAQEA7fG43my+5h7jHF6ISaeQPFRkaqC7QRee1j2z4nj3dwhZVD8Ma1uEFhaZsviqazglv8btSxL5f6ySGZKzOLFTOXRLJuU3V/5fJ9q+Y0vPjRNVS61i04LqxhY6SOOKyta+WSI+/UaNryy24vsY4lyIrqXJk7sqkUmjqy6M1bE7bZjwcsPzdzlu/t1KBO817OPPVYPD3tI4FLed5pPXh0QhGscmkKQfiBSJ6sMT7oGyLC2o0XFHNT8lgrLladYozxwhI+DplQj7cz8hE8Rog2GU6JU/qdSsEl0Bs2dAp/vkgwt70JYUGVOxU5/qIXTmEQDW1zgg9dEVocYAf6ye/jUpeQ=="