New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Azure PD Plugin (Blob + Managed Disks) #41950

Closed
wants to merge 38 commits into
base: master
from
Commits
Jump to file or symbol
Failed to load files and symbols.
+9 −5
Diff settings

Always

Just for now

Viewing a subset of changes. View all

fix merge confics with content

  • Loading branch information...
khenidak committed Apr 4, 2017
commit e7a3996157ec76dda74d9ea58b2dac0aebc4fba7
@@ -6285,4 +6285,4 @@ <h3 id="_any">any</h3>
</div>
</div>
</body>
</html>
</html>
@@ -5523,7 +5523,11 @@ <h3 id="_any">any</h3>
</div>
<div id="footer">
<div id="footer-text">
<<<<<<< HEAD
Last updated 2017-04-04 01:24:13 UTC
=======
Last updated 2017-03-28 17:18:59 UTC
>>>>>>> ff40d8b40839118555026646f02bfcc235073396
</div>
</div>
</body>
@@ -5623,4 +5623,4 @@ <h3 id="_any">any</h3>
</div>
</div>
</body>
</html>
</html>
@@ -7932,4 +7932,4 @@ <h3 id="_any">any</h3>
</div>
</div>
</body>
</html>
</html>
@@ -3821,4 +3821,4 @@ <h3 id="_any">any</h3>
</div>
</div>
</body>
</html>
</html>
@@ -9872,4 +9872,4 @@ <h3 id="_any">any</h3>
</div>
</div>
</body>
</html>
</html>
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.